Skip to content

Update Prometheus library to v 0.300.1#43540

Merged
ishleenk17 merged 36 commits intoelastic:mainfrom
ishleenk17:prometheus_300
Apr 23, 2025
Merged

Update Prometheus library to v 0.300.1#43540
ishleenk17 merged 36 commits intoelastic:mainfrom
ishleenk17:prometheus_300

Conversation

@ishleenk17
Copy link
Member

@ishleenk17 ishleenk17 commented Mar 27, 2025 •
edited
Loading

Update the Prometheus library to v0.300.1

Relates: #42916

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 27, 2025
@mergify
Copy link
Contributor

mergify bot commented Mar 27, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ishleenk17? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@gizas gizas mentioned this pull request Apr 2, 2025
Closed
gizas and others added 3 commits April 10, 2025 16:47
@gizas
adding files for remotewrite prom3
01e8d40 
Signed-off-by: Andreas Gkizas <andreas.gkizas@elastic.co>
@gizas
adding files for remotewrite prom3
3c52e6e 
Signed-off-by: Andreas Gkizas <andreas.gkizas@elastic.co>
@ishleenk17
Add comment
2a636b7
@mergify
Copy link
Contributor

mergify bot commented Apr 15, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b prometheus_300 upstream/prometheus_300
git merge upstream/main
git push upstream prometheus_300

@ishleenk17 ishleenk17 marked this pull request as ready for review April 21, 2025 04:51
@ishleenk17 ishleenk17 requested a review from a team as a code owner April 21, 2025 04:51
@ishleenk17
Copy link
Member Author

ishleenk17 commented Apr 22, 2025

Does this need a changelog entry?

Added changelog. Thanks

devamanv
devamanv approved these changes Apr 22, 2025
View reviewed changes
ishleenk17 and others added 2 commits April 22, 2025 17:34
@ishleenk17 @devamanv
Update metricbeat/helper/prometheus/textparse.go
9df88e1 
Co-authored-by: Aman <38116245+devamanv@users.noreply.github.com>
@ishleenk17 @devamanv
Update metricbeat/mb/parse/url.go
03cdce0 
Co-authored-by: Aman <38116245+devamanv@users.noreply.github.com>
tommyers-elastic
tommyers-elastic reviewed Apr 22, 2025
View reviewed changes
@tommyers-elastic tommyers-elastic mentioned this pull request Apr 22, 2025
Closed
1 task
@pierrehilbert pierrehilbert requested a review from rdner April 22, 2025 12:48
rdner
rdner approved these changes Apr 23, 2025
View reviewed changes
Copy link
Member

@rdner rdner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, have only one question.

@ishleenk17 ishleenk17 merged commit 6fd1224 into elastic:main Apr 23, 2025
190 checks passed
@swiatekm swiatekm mentioned this pull request Apr 23, 2025
Merged
2 tasks
@cmacknz
Copy link
Member

cmacknz commented Apr 23, 2025

Thanks! Should this also be backported to 8.19? I have a suspicion we won't be able to go for the entire LTS life time of that branch without needing to update this dependency because of a security update :)

@ishleenk17 ishleenk17 added the backport-8.19 Automated backport to the 8.19 branch label Apr 23, 2025
mergify bot pushed a commit that referenced this pull request Apr 23, 2025
@ishleenk17 @mergify
Update Prometheus library to v 0.300.1 (#43540)
5f1c893 
* Update Prometheus library

* Update NOTICE

* Update the default contenttype in testdata

* Resolve linter errors

* Resolve linter errors

* lint error

* adding files for remotewrite prom3

Signed-off-by: Andreas Gkizas <andreas.gkizas@elastic.co>

* adding files for remotewrite prom3

Signed-off-by: Andreas Gkizas <andreas.gkizas@elastic.co>

* Add comment

* Update go mod

* Add default port in URL parsing

* Add URL tests

* Resolve linter errors

* Update TestNewLeaderElectionManager flaky test

* Fix linter errors

* Update metricbeat/mb/parse/url.go

Co-authored-by: Aman <38116245+devamanv@users.noreply.github.com>

* Update url.go

* update err

* CI error

* log update

* upfdate defaultPort

* update changelog

* Update metricbeat/helper/prometheus/textparse.go

Co-authored-by: Aman <38116245+devamanv@users.noreply.github.com>

* Update metricbeat/mb/parse/url.go

Co-authored-by: Aman <38116245+devamanv@users.noreply.github.com>

---------

Signed-off-by: Andreas Gkizas <andreas.gkizas@elastic.co>
Co-authored-by: Andreas Gkizas <andreas.gkizas@elastic.co>
Co-authored-by: Michalis Katsoulis <michaelkatsoulis88@gmail.com>
Co-authored-by: Aman <38116245+devamanv@users.noreply.github.com>
(cherry picked from commit 6fd1224)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
This was referenced Apr 23, 2025
Merged
Merged
Closed
Merged
devamanv pushed a commit that referenced this pull request Apr 30, 2025
@mergify
[8.19](backport #43540) Update Prometheus library to v 0.300.1 (#44036)
c2728b0
@ishleenk17
Copy link
Member Author

ishleenk17 commented Apr 30, 2025

Thanks! Should this also be backported to 8.19? I have a suspicion we won't be able to go for the entire LTS life time of that branch without needing to update this dependency because of a security update :)

This has been backported to 8.19.

@cmacknz
Copy link
Member

cmacknz commented Apr 30, 2025

Thank you!

@khushijain21 khushijain21 mentioned this pull request Sep 8, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rdner rdner rdner approved these changes

@MichaelKatsoulis MichaelKatsoulis MichaelKatsoulis approved these changes

@devamanv devamanv devamanv approved these changes

@andrzej-stencel andrzej-stencel andrzej-stencel approved these changes

@tommyers-elastic tommyers-elastic tommyers-elastic approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr is a code owner automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman is a code owner automatically assigned from elastic/elastic-agent-data-plane

@michalpristas michalpristas Awaiting requested review from michalpristas michalpristas is a code owner automatically assigned from elastic/elastic-agent-control-plane

@pkoutsovasilis pkoutsovasilis Awaiting requested review from pkoutsovasilis pkoutsovasilis is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@ishleenk17 ishleenk17

Labels

backport-8.19 Automated backport to the 8.19 branch Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@ishleenk17 @elasticmachine @cmacknz @rdner @MichaelKatsoulis @devamanv @andrzej-stencel @tommyers-elastic @pierrehilbert @gizas